Can you fix the merge conflict?

Can you fix the merge conflict?

Yah, I fixed it.

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (98bcb76) 47.34% compared to head (3943a6c) 16.21%.
Report is 71 commits behind head on master.

❗ Current head 3943a6c differs from pull request most recent head 7c4cd03. Consider uploading reports for the commit 7c4cd03 to get more accurate results

@@             Coverage Diff             @@
##           master    #2461       +/-   ##
===========================================
- Coverage   47.34%   16.21%   -31.13%     
===========================================
  Files         395      160      -235     
  Lines       44045    12559    -31486     
  Branches      487      487               
===========================================
- Hits        20854     2037    -18817     
+ Misses      21600    10353    -11247     
+ Partials     1591      169     -1422     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kannon92 pls review the changes!!

@kannon92 pls review the changes

Can we get CI and the conflicts fixed please?

Can we get CI and the conflicts fixed please?

Yes, i will try my best

@sarthaksarthak9 If you follow the instructions in the Details link for the DCO sign-off check, and also re-merge from master, that should fix both check issues - let us know if you have any questions.

@sarthaksarthak9 If you follow the instructions in the Details link for the DCO sign-off check, and also re-merge from master, that should fix both check issues - let us know if you have any questions.

okk!!

@sarthaksarthak9 If you follow the instructions in the Details link for the DCO sign-off check, and also re-merge from master, that should fix both check issues - let us know if you have any questions.

@richscott this week , I'm involved in my university exams . I'll start working after that!!

@sarthaksarthak9 If you follow the instructions in the Details link for the DCO sign-off check, and also re-merge from master, that should fix both check issues - let us know if you have any questions.

is there any jobservice class exist?

is there any jobservice class exist

Well, there are several data-type definitions for Job-Service-related services:

• the server (JobServiceServer) is defined in internal/jobservice/server/server.go
• the SQLJobService database layer is a Go interface defined in internal/jobservice/repository/sql_job_service.go - it is basically a very thin shim over the JSRepostgres and JSRepoSQLite interface implementations. The Job Service server calls the methods on that interface to update the JS database as it receives messages from GRPC and the REST API.

Most of the code is in internal/jobservice. The GRPC definitions are in pkg/api/jobservice/. The server command (has the main() startpoint) is in cmd/jobservice/.

If you don't see a jobservice class in python, make sure to run the mage target to generate them. mage airflow-operator.

is there any jobservice class exist

Well, there are several data-type definitions for Job-Service-related services:

• the server (JobServiceServer) is defined in internal/jobservice/server/server.go
• the SQLJobService database layer is a Go interface defined in internal/jobservice/repository/sql_job_service.go - it is basically a very thin shim over the JSRepostgres and JSRepoSQLite interface implementations. The Job Service server calls the methods on that interface to update the JS database as it receives messages from GRPC and the REST API.

Most of the code is in internal/jobservice. The GRPC definitions are in pkg/api/jobservice/. The server command (has the main() startpoint) is in cmd/jobservice/.

thank you

If you don't see a jobservice class in python, make sure to run the mage target to generate them. mage airflow-operator.

thank you @kannon92

@Sharpz7 I think unit test which I created causing CI - failure? Should I remove it !!

@sarthaksarthak9 ideally no, if you are instead able to fix the error, it doesn't seem that hard.

@sarthaksarthak9 ideally no, if you are instead able to fix the error, it doesn't seem that hard.

I'll try my best

@Sharpz7 I'm getting this error. Installation of mage is done
(armada3) sarthak@hp-pavilion:~/armada$ mage airflow-operator
Unknown target specified: "airflow-operator"

also does armada remove the support of make ?

@Sharpz7 I'm getting this error. Installation of mage is done (armada3) sarthak@hp-pavilion:~/armada$ mage airflow-operator Unknown target specified: "airflow-operator"

also does armada remove the support of make ?

Hi, Sarthak. Yes, we have removed support for using Make as a build tool for the Armada repository, and have migrated completely to Mage. The target names have been slightly altered in the Mage transition - in this case, you would run mage airflowOperator. You can get a list of all the Mage targets by running mage -l.

@Sharpz7 I'm getting this error. Installation of mage is done (armada3) sarthak@hp-pavilion:~/armada$ mage airflow-operator Unknown target specified: "airflow-operator"
also does armada remove the support of make ?

Hi, Sarthak. Yes, we have removed support for using Make as a build tool for the Armada repository, and have migrated completely to Mage. The target names have been slightly altered in the Mage transition - in this case, you would run mage airflowOperator. You can get a list of all the Mage targets by running mage -l.

thank you